Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 18 Apr 2010 23:17:16 +0000 (23:17 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 18 Apr 2010 23:17:16 +0000 (23:17 +0000)

Trivial merge